diff --git a/hikey960.mk b/hikey960.mk
index 19d972e..035002e 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -1,5 +1,5 @@
 ifndef TARGET_KERNEL_USE
-TARGET_KERNEL_USE=4.19
+TARGET_KERNEL_USE=5.4
 endif
 TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE)/Image.gz-dtb
 TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hikey960/$(TARGET_KERNEL_USE)/hi3660-hikey960.dtb
@@ -16,6 +16,12 @@
   HIKEY_USE_LEGACY_TI_BLUETOOTH := false
 endif
 
+ifndef HIKEY_USES_GKI
+  ifeq ($(TARGET_KERNEL_USE), 5.4)
+    HIKEY_USES_GKI := true
+  endif
+endif
+
 #
 # Inherit the full_base and device configurations
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)